From 6822dce8fb3153231a7f9932e1192f2c1bb0988f Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Fri, 20 Mar 2020 09:16:30 -0700
Subject: [PATCH] widget: move class private data to gtkwidgetprivate.h

We want access to the private data from the action muxer so we can just
move the structures to the gtkwidgetprivate.h header. Alternatively we
could create accessors, but given that we'll probably need to use this
in other areas, seems reasonable to just put it there.
---
 gtk/gtkwidget.c        | 16 ----------------
 gtk/gtkwidgetprivate.h | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 96e111bfe5..e4e610b7e6 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -484,22 +484,6 @@ typedef struct {
   GCallback  callback_symbol;
 } CallbackSymbol;
 
-typedef struct {
-  GBytes               *data;
-  GSList               *children;
-  GtkBuilderScope      *scope;
-} GtkWidgetTemplate;
-
-struct _GtkWidgetClassPrivate
-{
-  GtkWidgetTemplate *template;
-  GType accessible_type;
-  AtkRole accessible_role;
-  GQuark css_name;
-  GType layout_manager_type;
-  GPtrArray *actions;
-};
-
 enum {
   DESTROY,
   SHOW,
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 1018c9c915..ecac555813 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -201,6 +201,23 @@ struct _GtkWidgetPrivate
   GdkCursor *cursor;
 };
 
+typedef struct
+{
+  GBytes *data;
+  GSList *children;
+  GtkBuilderScope *scope;
+} GtkWidgetTemplate;
+
+struct _GtkWidgetClassPrivate
+{
+  GtkWidgetTemplate *template;
+  GType accessible_type;
+  AtkRole accessible_role;
+  GQuark css_name;
+  GType layout_manager_type;
+  GtkWidgetAction *actions;
+};
+
 void          gtk_widget_root               (GtkWidget *widget);
 void          gtk_widget_unroot             (GtkWidget *widget);
 GtkCssNode *  gtk_widget_get_css_node       (GtkWidget *widget);
-- 
2.30.2